bitkeeper revision 1.1230.2.2 (421a8798mvsMIGmWCHsDOB-iq7xzGg)

Bring back the console_{putc,getc} set of functions, which
export access to the console without exporting the sercon_handle.
Signed-off-by: chris@xensource.com

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 0ae6aaece959ae16add6f74a5aaff57da0497a02..10dd4717c5e5f254236746178ac991f87d5663a0 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -466,6 +466,20 @@ void console_force_lock(void)
     spin_lock(&console_lock);
 }
 
+void console_putc(char c)
+{
+    serial_putc(sercon_handle, c);
+}
+
+int console_getc(void)
+{
+    return serial_getc(sercon_handle);
+}
+
+int irq_console_getc(void)
+{
+    return irq_serial_getc(sercon_handle);
+}
 
 
 /*

diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h
index 024840c0addec83513bed6876bad1feb7bbdca68..f65633a1af22c9eecf141604b63f722c8eab6d98 100644 (file)
--- a/xen/include/xen/console.h
+++ b/xen/include/xen/console.h
@@ -22,4 +22,8 @@ void console_endboot(int disable_vga);
 void console_force_unlock(void);
 void console_force_lock(void);
 
+void console_putc(char c);
+int console_getc(void);
+int irq_console_getc(void);
+
 #endif /* __CONSOLE_H__ */